From ae32ada0b939fcd7eef9646b727150d7f00a4af8 Mon Sep 17 00:00:00 2001
From: robertl <robertl>
Date: Thu, 28 Jul 2005 20:33:43 +0000
Subject: [PATCH] Rename 'dopfilter' (nee 'fix') to 'discard'.

---
 Makefile               | 4 ++--
 README                 | 4 ++--
 dopfilt.c => discard.c | 4 ++--
 filter_vecs.c          | 8 ++++----
 testo                  | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename dopfilt.c => discard.c (96%)

diff --git a/Makefile b/Makefile
index ea49b19c6..bc5c8a9c9 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o garmin_tables.o \
 	vcf.o overlay.o kml.o google.o lowranceusr.o an1.o tomtom.o \
 	tef_xml.o maggeo.o pathaway.o vitosmt.o gdb.o bcr.o coto.o
 
-FILTERS=position.o duplicate.o arcdist.o polygon.o smplrout.o reverse_route.o sort.o stackfilter.o trackfilter.o dopfilt.o
+FILTERS=position.o duplicate.o arcdist.o polygon.o smplrout.o reverse_route.o sort.o stackfilter.o trackfilter.o discard.o
 
 OSJEEPS=jeeps/gpslibusb.o
 JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
@@ -157,7 +157,7 @@ copilot.o: copilot.c defs.h queue.h gbtypes.h coldsync/palm.h \
 csv_util.o: csv_util.c defs.h queue.h gbtypes.h csv_util.h grtcirc.h \
   strptime.h
 delgpl.o: delgpl.c defs.h queue.h gbtypes.h
-dopfilt.o: dopfilt.c defs.h queue.h gbtypes.h
+discard.o: discard.c defs.h queue.h gbtypes.h
 duplicate.o: duplicate.c defs.h queue.h gbtypes.h
 easygps.o: easygps.c defs.h queue.h gbtypes.h
 filter_vecs.o: filter_vecs.c defs.h queue.h gbtypes.h
diff --git a/README b/README
index 12de958f7..4e0bfda82 100644
--- a/README
+++ b/README
@@ -1323,7 +1323,7 @@ DATA FILTERS
 			-x track,pack,split=4h,title="LOG # %c" \ 
 			-o gpx -F out.gpx
 
-    DOP
+    DISCARD
 
         This filter 'fixes' gps data by discarding points with a hdop
         and/or vdop over a set limit. If you give both the hdop and a
@@ -1346,7 +1346,7 @@ DATA FILTERS
 
             Example: gpsbabel \ 
 		-i gpx -f in.gpx \
-		-x fix,hdop=10,vdop=20,hdopandvdop \ 
+		-x discard,hdop=10,vdop=20,hdopandvdop \ 
 		-o gpx -F out.gpx
 
         Contributed by Tobias Minich.
diff --git a/dopfilt.c b/discard.c
similarity index 96%
rename from dopfilt.c
rename to discard.c
index 7a767b5dc..7ecca8152 100644
--- a/dopfilt.c
+++ b/discard.c
@@ -1,5 +1,5 @@
 /*
-    Suppress points based on high Degree of Precision (DOP) values.
+    Discard points based on high Degree of Precision (DOP) values.
 
     Copyright (C) 2005 Robert Lipe, robertlipe@usa.net
 
@@ -132,7 +132,7 @@ fix_deinit(void)
 {
 }
 
-filter_vecs_t fix_vecs = {
+filter_vecs_t discard_vecs = {
 	fix_init,
 	fix_process,
 	fix_deinit,
diff --git a/filter_vecs.c b/filter_vecs.c
index 8531911d9..1aa5ca1b4 100644
--- a/filter_vecs.c
+++ b/filter_vecs.c
@@ -38,7 +38,7 @@ extern filter_vecs_t reverse_route_vecs;
 extern filter_vecs_t sort_vecs;
 extern filter_vecs_t stackfilt_vecs;
 extern filter_vecs_t trackfilter_vecs;
-extern filter_vecs_t fix_vecs;
+extern filter_vecs_t discard_vecs;
 
 static
 fl_vecs_t filter_vec_list[] = {
@@ -93,9 +93,9 @@ fl_vecs_t filter_vec_list[] = {
 		"Manipulate track lists"
 	},
 	{
-		&fix_vecs,
-		"dop",
-		"Remove unreliable points with high hdop or vdop."
+		&discard_vecs,
+		"discard",
+		"Remove unreliable points with high hdop or vdop"
 	},
         {
 		NULL,
diff --git a/testo b/testo
index 98ddb611a..8c5db2a43 100755
--- a/testo
+++ b/testo
@@ -769,10 +769,10 @@ compare ${TMPDIR}/glog1.gpx ${TMPDIR}/glog2.gpx
 #
 rm -f ${TMPDIR}/dop*
 sed '/<hdop>50/d' reference/dop-test.gpx | ${PNAME} -i gpx -f - -o openoffice -F - | sed 's/RPT...//g' > ${TMPDIR}/dop-hdop.ref
-${PNAME} -i gpx -f reference/dop-test.gpx -x dop,hdop=50 -o openoffice -F - | sed 's/RPT...//g' > ${TMPDIR}/dop-hdop.fil
+${PNAME} -i gpx -f reference/dop-test.gpx -x discard,hdop=50 -o openoffice -F - | sed 's/RPT...//g' > ${TMPDIR}/dop-hdop.fil
 compare ${TMPDIR}/dop-hdop.ref ${TMPDIR}/dop-hdop.fil
 sed '/<vdop>50/d' reference/dop-test.gpx | ${PNAME} -i gpx -f - -o openoffice -F - | sed 's/RPT...//g' > ${TMPDIR}/dop-vdop.ref
-${PNAME} -i gpx -f reference/dop-test.gpx -x dop,vdop=50 -o openoffice -F - | sed 's/RPT...//g' > ${TMPDIR}/dop-vdop.fil
+${PNAME} -i gpx -f reference/dop-test.gpx -x discard,vdop=50 -o openoffice -F - | sed 's/RPT...//g' > ${TMPDIR}/dop-vdop.fil
 compare ${TMPDIR}/dop-vdop.ref ${TMPDIR}/dop-vdop.fil
 
 #
-- 
2.30.2